From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 16 May 2011 14:46:30 +0000 (+0000)
Subject: nntp.el (nntp-open-connection): Check if process-type is available.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3799
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a27d8b0c8688547521a45abd0c4af7cbce4ed183;p=emacs.git

nntp.el (nntp-open-connection): Check if process-type is available.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index feebcbae701..6791c5f6063 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nntp.el (nntp-open-connection): Check if process-type is available.
+
 2011-05-16  Julien Danjou  <julien@danjou.info>
 
 	* shr.el (shr-tag-del): Add support for del tag.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index aa4b9184dbb..cdd12abbc06 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1362,7 +1362,8 @@ password contained in '~/.nntp-authinfo'."
       (nntp-kill-buffer pbuffer))
     (when (and (buffer-name pbuffer)
 	       process)
-      (when (and (fboundp 'set-network-process-option)
+      (when (and (fboundp 'set-network-process-option) ;; Unavailable in XEmacs.
+		 (fboundp 'process-type) ;; Emacs 22 doesn't provide it.
                  (eq (process-type process) 'network))
         ;; Use TCP-keepalive so that connections that pass through a NAT router
         ;; don't hang when left idle.